Don't use Gtk+ tooltip unless Gtk+ version => 2.14.

* gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
USE_GTK_TOOLTIP.
(xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP
(xg_show_tooltip, xg_hide_tooltip): Do nothing unless
USE_GTK_TOOLTIP.
(xg_create_frame_widgets): Surrond tooltip-related code with ifdef
USE_GTK_TOOLTIP.
(xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.

* xterm.h (USE_GTK_TOOLTIP): New define.
(struct x_output): Put ttip_* inside ifdef USE_GTK_TOOLTIP.

diff --git a/src/ChangeLog b/src/ChangeLog
index d4c46dfd43574b833b042f2800b0444263ec30db..7b3755b27bc93bd4be59d2be01cab47d78914176 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 2010-08-02  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
+       USE_GTK_TOOLTIP.
+       (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP
+       (xg_show_tooltip, xg_hide_tooltip): Do nothing unless
+       USE_GTK_TOOLTIP.
+       (xg_create_frame_widgets): Surrond tooltip-related code with ifdef
+       USE_GTK_TOOLTIP.
+       (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
+
+       * xterm.h (USE_GTK_TOOLTIP): New define.
+       (struct x_output): Put ttip_* inside ifdef USE_GTK_TOOLTIP.
+
        * sysdep.c (child_setup_tty): Enable ICANON in lflags and set VEOF
        to Control-D (Bug#6771).
 

diff --git a/src/xterm.h b/src/xterm.h
index 1674cdbac689290d90360ed6f34adb98e86b8b6d..278c6b13cf1369749a049e98121477f98c8be205 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -51,6 +51,10 @@ typedef GtkWidget *xt_or_gtk_widget;
 #define XSync(d, b) do { gdk_window_process_all_updates (); \
                          XSync (d, b);  } while (0)
 
+/* The GtkTooltip API came in 2.12, but gtk-enable-tooltips in 2.14. */
+#if GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION > 13
+#define USE_GTK_TOOLTIP
+#endif
 
 #endif /* USE_GTK */
 
@@ -503,10 +507,13 @@ struct x_output
   GdkGeometry size_hints;
   long hint_flags;
 
+#ifdef USE_GTK_TOOLTIP
   GtkTooltip *ttip_widget;
   GtkWidget *ttip_lbl;
   GtkWindow *ttip_window;
-#endif
+#endif /* USE_GTK_TOOLTIP */
+
+#endif /* USE_GTK */
 
   /* If >=0, a bitmap index.  The indicated bitmap is used for the
      icon. */